@@ -215,6 +215,20 @@ def DJANGO_WE_REDIS_OBJ_FUNC(request):  | 
            ||
| 215 | 215 | 
                return r  | 
            
| 216 | 216 | 
                 | 
            
| 217 | 217 | 
                 | 
            
| 218 | 
                +def DJANGO_FILE_UPLOAD_BASE_PATH_CALLBACK_FUNC(request):  | 
            |
| 219 | 
                + """ DJANGO FILE UPLOAD BASE PATH Callback Func """  | 
            |
| 220 | 
                +    zbar = int(request.POST.get('zbar', 0))
               | 
            |
| 221 | 
                + if zbar:  | 
            |
| 222 | 
                + return 'zbar'  | 
            |
| 223 | 
                +  | 
            |
| 224 | 
                +    zbar2 = int(request.POST.get('zbar2', 0))
               | 
            |
| 225 | 
                + if zbar2:  | 
            |
| 226 | 
                + return 'zbar2'  | 
            |
| 227 | 
                +  | 
            |
| 228 | 
                +    file_type = request.POST.get('file_type', '')
               | 
            |
| 229 | 
                + return file_type  | 
            |
| 230 | 
                +  | 
            |
| 231 | 
                +  | 
            |
| 218 | 232 | 
                def DJANGO_FILE_UPLOAD_CALLBACK_FUNC(request, file_path=None, file_url=None):  | 
            
| 219 | 233 | 
                """ DJANGO FILE UPLOAD Callback Func """  | 
            
| 220 | 234 | 
                from logs.models import MchLogInfo  | 
            
                @@ -244,7 +258,7 @@ def DJANGO_FILE_UPLOAD_CALLBACK_FUNC(request, file_path=None, file_url=None):  | 
            ||
| 244 | 258 | 
                }  | 
            
| 245 | 259 | 
                 | 
            
| 246 | 260 | 
                     zbar2 = int(request.POST.get('zbar2', 0))
               | 
            
| 247 | 
                - if zbar:  | 
            |
| 261 | 
                + if zbar2:  | 
            |
| 248 | 262 | 
                import os  | 
            
| 249 | 263 | 
                 | 
            
| 250 | 264 | 
                from utils.zbar.zbar2 import zbar2  | 
            
                @@ -9,6 +9,7 @@ mock==4.0.3  | 
            ||
| 9 | 9 | 
                monetary==1.0.3  | 
            
| 10 | 10 | 
                mysqlclient==2.0.3  | 
            
| 11 | 11 | 
                pysnippets==1.1.4  | 
            
| 12 | 
                +pyzbar==0.1.8  | 
            |
| 12 | 13 | 
                qiniu==7.5.0  | 
            
| 13 | 14 | 
                requests==2.26.0  | 
            
| 14 | 15 | 
                rlog==0.3  | 
            
                @@ -5,7 +5,7 @@ django-curtail-uuid==1.0.4  | 
            ||
| 5 | 5 | 
                django-daterange-filter==1.3.0  | 
            
| 6 | 6 | 
                django-detect==1.0.20  | 
            
| 7 | 7 | 
                django-file-md5==1.0.3  | 
            
| 8 | 
                -django-file-upload==1.1.1  | 
            |
| 8 | 
                +django-file-upload==1.1.3  | 
            |
| 9 | 9 | 
                django-ip==1.0.2  | 
            
| 10 | 10 | 
                django-json-render==1.0.3  | 
            
| 11 | 11 | 
                django-json-response==1.1.5  |